settings: Wayland-only systems also use fontconfig
authorEmmanuele Bassi <ebassi@gnome.org>
Mon, 4 May 2015 12:28:14 +0000 (13:28 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Tue, 5 May 2015 10:22:53 +0000 (11:22 +0100)
We're relying on the X11 backend being compiled in, but that may not be
the case.

https://bugzilla.gnome.org/show_bug.cgi?id=748782

gtk/gtksettings.c

index a23730fe7105ed2917cea6c28fba3bf183b1bafe..2356715cec438cbd64dc1b1c99631ed2822b017f 100644 (file)
@@ -3030,7 +3030,7 @@ settings_update_font_options (GtkSettings *settings)
 static gboolean
 settings_update_fontconfig (GtkSettings *settings)
 {
-#ifdef GDK_WINDOWING_X11
+#if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND)
   static guint    last_update_timestamp;
   static gboolean last_update_needed;
 
@@ -3064,7 +3064,7 @@ settings_update_fontconfig (GtkSettings *settings)
   return last_update_needed;
 #else
   return FALSE;
-#endif /* GDK_WINDOWING_X11 */
+#endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WAYLAND */
 }
 
 static void